Merge changes I67420353,I6851f9b9