Merge 685eae47d53a633e02342f2c6f2b55d41129e443 on remote branch

Change-Id: I5b58aa87e528403da2bffb7fc8d0b628e9d24bb7