Reconcile with jb-mr2-release - do not merge

Change-Id: Ic2d8fb42f01f3d9ffeeffd2b0a02bc3ddbad2ed7