Merge d6ff0c0ce96e1220df1042451ba2e47c3bf548f6 on remote branch

Change-Id: Ia1082faebc7ba997c0b162592987d7be52bb3dd4