Reconcile with jb-mr0-release jb-release - do not merge

Change-Id: I3ba16c8a37fd836c6c74dcfd1793f8bc1282b746