Reconcile with jb-mr1-release - do not merge

Change-Id: I17f75cece44e1e9dfe9707346ee7168ca0f0a654