Merge "Fix typo according to API review."
am: c83e37317f

Change-Id: Id117c63b6b59f48585ef0d8ae93fb7715a8118b0