Merge 54dc703c9b5a8a7e457ba5840dbe56cb46aebdf5 on remote branch

Change-Id: Ic21582fb8282702447e69d4515787f49767f23fc