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

Change-Id: I297fc033ce22b086d98c050e91c8c2dc262c56c9