Merge "Fix OffloadThread VolumeShaper issue"
am: b7a4a3c492

Change-Id: Ia166a3a4c036a0400b0220dd20d54aacbf286abb