Reconcile with jb-mr0-release - do not merge

Change-Id: Iaa7372f223059e828c2f256c83b8d6e7d39bd74a