Merge 9ca42a51d54e7a129361d242ff3c138b336bee3a on remote branch

Change-Id: I73408ed352dbf148178f8803e2327881cb4b018d