Merge changes I92111dbe,I9f919005