This change does not have any impact on the bitstream. Change-Id: Ib7cf344eb1e682cdc2c5abdc0621d65e70689ab4