Reconcile with jb-mr0-release - do not merge

Change-Id: I59b20739215fa5f8461542c637961f98c1abb962