Merge changes I2fa51cf4,I9ed7c24c,Iad539945