Reconcile with jb-mr0-release - do not merge

Change-Id: I41bb7c5875f0eef1fd8c31f98f628718a966eddc