Merge changes I44c8b60c,I0cb6d383