Merge 73770bf6d27c7c52c0b811eb8ed711851b48fb3f on remote branch

Change-Id: I21000eeb0b62adcd2e058c15579d3359cea9b471