Reconcile with jb-mr0-release - do not merge

Change-Id: I3ec7be5d1d08566f120f18b68d2f691f92f006c8