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

Change-Id: Ie836fed5bcca4fa9eaf4893d65e65d70f8225979