Reconcile with jb-mr1.1-release - do not merge

Change-Id: I89a74a8a7673ea15625a79c5d9c5f7b111276ec3