Merge changes I27d64e31,I9d7bba90