Merge 74bd06643035ad76a3f537d7d30b0eb86cbf62a0 on remote branch

Change-Id: I467eaa9a3db39e400c4277021bfdac041fefcef5