2.8.2.0

Change-Id: I8d689db9c8bf5ff6c5175ee9185e89ab72a1a2fd