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

Change-Id: Ib4c90d47d0d64db2c116a47f026fb8a4c78461f9