Reconcile with jb-mr1-release - do not merge

Change-Id: Ica4f7fbb23b13d145c11f1e58fdd68011b435ee3