Reconcile with jb-mr1-release - do not merge

Change-Id: I8497c7775dbf3b4764ffb6aff7c4aa209739dd3f