Merge changes I3349bcdd,I552b5e17