Reconcile with jb-mr2-release - do not merge

Change-Id: Idea87dd5e6316329e52e0817794e2fa5ff056575