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

Change-Id: Iff336b51ffc2893168e67406d96bc6dd97735b7e