Merge changes I2927cbf5,I35d6b4ed,Iffd49368