Merge 499935e04984852813fef423a6dcfebcf9d57a85 on remote branch

Change-Id: I2992f39f1f5d7999e145f0f832172dc73f52fde1