Merge 5696a5b6fa7de45aca52123c1db6e18140622014 on remote branch

Change-Id: I1886343b4c0ac36107176982fa471de51922a7a2