Merge e56ed120e22945949c2d794c62de57c591de70d0 on remote branch

Change-Id: I390ba74d3a27831da9ead26cf979a89553027e99