am af0ae048: Reconcile with jb-mr1-release - do not merge

* commit 'af0ae048816e086e07c5e6cc2890681966ea63d0':