Merge 7e7e6a2f9b977388dfc291bbcc7ca8b19aa421d1 on remote branch

Change-Id: I1f293d033f46f95127b5da19701b1eeadba850bc