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

* commit '2e9c6f37f8a839a6e31f118a5748ea8faac152a8':
  Fix previous changes.