Reconcile with jb-mr1-release - do not merge

Change-Id: If85f28cdbccda3f78297d611fb01a38ee310e208