Merge e679c5a2c791068d097b65a949a0ad69537471b1 on remote branch

Change-Id: I65d85b7d31776ab97672272b64c759f52e188cf3