Merge 652e5e876009c4fa7ad61dc26d3e4cd84e9827d4 on remote branch

Change-Id: I4da3d8b665e572cd7d0ab4fef620fb38944ac67e