Reconcile with jb-mr1-release - do not merge

Change-Id: I9bc9016d2ef2607e2a6fd596f9c6828872e7de6f