Reconcile with jb-mr1-release - do not merge

Change-Id: Id33938301894ba2f75fa5f6242842cc534ae31f4