Merge changes I4108ba7e,I42964284