Reconcile with jb-mr1-release - do not merge

Change-Id: Iea091cf0ec873075e14c7a17ed185e9cbde68d1c