Merge ec3144e29ec834b435dd362c11cf9c0a0769910d on remote branch

Change-Id: I0796ae0f3141db66babb64c1c2c4f1c7a566788c