Fixes for 2.8.2.0

Change-Id: If6a87ccd8c70051a9923562aeb50716c06594824