am c66e994c: am b791a5fb: Reconcile with jb-mr1-release - do not merge

* commit 'c66e994c3b0609eca4fa33d95cdf6fbae44ae128':
  JOP37B