Merge 3e29a0c49e5052523050b4f794229c0bd4d24e61 on remote branch

Change-Id: Ie19d3864bb8ce8ed9d3466dc9f4745b233ed5224