Merge fb92838227a47722bdbe04e8870d442315e4c774 on remote branch

Change-Id: Id947c00f18a1f9f487b992de29663f118a4ebf2a