Reconcile with jb-mr1-release - do not merge

Change-Id: If9b215d19d88c3f1793013adc8cb81c8c890faa0