Reconcile with jb-mr1-release - do not merge

Change-Id: If6035738d15eeca0514c2c03777200b9918721d1