Reconcile with jb-mr2-release - do not merge

Change-Id: I306093279fb3d696c367ecc9b2d485dae175d3ff