Merge "Fix OffloadThread VolumeShaper issue" am: b7a4a3c492
am: 3ca47ba98d

Change-Id: I837248a1e675d40fe2fa030764b596a2b36a2ec2