Reconcile with jb-mr2-release - do not merge

Change-Id: I0efd5b7abf85eef483d78230de4411f330c2f4f6