Merge 54a0dafc7854d78eb4e2731f8bb534470e25947a on remote branch

Change-Id: Ic631a87d7fe432682474ea257e00133da11436f6