Merge "[automerger skipped] Merge "Fix typo according to API review." am:...
Merge "[automerger skipped] Merge "Fix typo according to API review." am: c83e3731 am: 8585a455 am: 5f848242 -s ours am skip reason: change_id I4c1cc7badf3646e970272a663922a0ae98988cab with SHA1 1c7bd090 is in history"