Reconcile with jb-mr2-release - do not merge

Change-Id: I767de8f5cbf8049b5dfd310283d5a6864351bf20