Merge changes I05cce46d,Ia329ea5f,I933c58d1