Merge 3e059180ffd3d68a3ead6c1a4dc3f04cc060d637 on remote branch

Change-Id: I168709d0627fdf5840d766c46a0f3acf26cb052e