am 56c58a2e: Merge "Fix typo. bug: b/20610710" into mnc-dev

* commit '56c58a2e278fb4644963dfe2a49b74471afe71c9':
  Fix typo. bug: b/20610710