Merge 0eb252814cba32382ef5847929f2b2801552542b on remote branch

Change-Id: Ie61769f816f29785877ad6ac6ade7097f483167c