Merge changes I8295bb63,I628ef618,Ic7ebdea9,I21faea97