Merge 99a7d7c5ed2afe582571c0f706bd1e21d1473f66 on remote branch

Change-Id: I3b6065c2e0081ef23348322ac43570e3563f4e01