Merge 4e6050832981f68830765491a4230597b888cbf4 on remote branch

Change-Id: I8a8704d7e6fff1a07e56ff9258b0940c54de77ff