Merge 1a0b4b6dda948b69dc55244e9a197b6911b5a56f on remote branch

Change-Id: Ie52ca33194ece883b2739bb0b3b95c999aeee040