Merge e70b95601ec782d06584ef68150feb5f44eb5cf2 on remote branch

Change-Id: I3edc4494405e6c6c01f6a31a61045051b3080082