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

* commit '94d7494a2b98b723710eee9d3398e99e64b7688b':
  Fix typo. bug: b/20610710