Merge 477b96e9604a126887b43e6fb8a1157b13e72270 on remote branch

Change-Id: Ia0987c33cc5d9e9f90f9264b90c4480b6d4bebf2