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

Change-Id: Ie4823c17d8d4122af8165004e2aac0bf30421627