Merge "Fix typos."
am: dc46115ab2

Change-Id: I83b7a0fdc20c313a98009f9baef5ac21c7a193a2