Reconcile with jb-mr2-release - do not merge

Change-Id: I3dff434f8e95a5c15b4ef4bca3c05bdfa163df0e