Merge 2eafc50d470d52291320c7af3dac05e37d96dc88 on remote branch

Change-Id: I0cab233608aa01842001c8bd09334e918878f7d9