Merge d7a356dd15254214931c2cecff35aec515499046 on remote branch

Change-Id: Ibf7abd08060ea3998a2657b49bc7354630bc2625