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

Change-Id: Ie316ff212720e9b6cc3c81e52f1acd44cea854d6