Reconcile with jb-mr2-release - do not merge

Change-Id: I731b1db7da9f82dbb92a3e1dc40bfab1a3f307e2