Merge 70dc242a61d2c11bc3d117c3a3235b73c56ca25b on remote branch

Change-Id: I28b3f191d9f6d6ce598d3fb7cbf2d0b16fc70ebd