Merge "Fix typos." am: dc46115ab2
am: 47bbad53b9

Change-Id: Iee688d0c5c1bfcffc84053558ea78e6d02385876