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

Change-Id: Ia0536d6a75f255879a24145def55c44c93050aaa