Merge 7f4ce3a255d5dfc97b870737f12abbb0787a4d4c on remote branch

Change-Id: Ia8adb5ac31f9bc432936cb791589bd0c4cf509d0