Reconcile with jb-mr1-release - do not merge

Change-Id: Ie31a50f2edd4ef863f56f8939fcf8e806fb2ba0a