Merge changes I3277d48b,I11a91825