Merge changes I3e404877,Ida2a5c32,I9e6ce426,I6a4b90f6,I79717533