Merge changes I6575ddd8,I4b78f51d,I0a0441e6