Merge changes I0fe4b78d,I3d3bc71b