Merge 957e5f7cde893885a914a8d51f465d9712ad2988 on remote branch

Change-Id: Ib3f9231f763ea228558b21dc684a21093aeaa292