Merge "[automerger skipped] Merge "Fix typo according to API review." am: c83e37317f am: 8585a4556c am: 5f848242a1 -s ours am skip reason: change_id I4c1cc7badf3646e970272a663922a0ae98988cab with SHA1 1c7bd090c9 is in history"