am 0d3eb5f1: am 721b370c: Merge "cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo" into jb-mr1-dev

* commit '0d3eb5f111571f40c1c25dab229a6b8a98e61eeb':
  cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo