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

Change-Id: I4a96ee0e6bfce143dcf36ad1831f5fbe41965a83