am 06e617f5: am 497661d3: Merge "Fixes typo." into ics-mr1

* commit '06e617f5a6f68ca99118268eb7361bb1e5ade0a5':
  Fixes typo.