Reconcile with jb-mr2-release - do not merge

Change-Id: Iaed3507a353fc057c8cc2bba136a043d61bc9e96