Merge changes I9991ee73,I26c6f70d,I8be28014,I7f500261