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

Change-Id: I6f3ca8c4ce83100bc3da52d60b238640d9e301cb