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

Change-Id: I1f1dd624a0e8cb1fd8b767acfccd092f6b81230e