Merge changes I52c33d1d,I162e4119