am 13837944: am 2e9c6f37: Merge "Fix previous changes." into jb-mr2-dev

* commit '1383794416a9362df29c045a18554ea2001d84ef':
  Fix previous changes.