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

Change-Id: Ibd953a315da9b30dd2b3d31f9fb1aea3f7807804