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

Change-Id: I9fe3d8300f819d82e3d73a632910b9a87c4e32fc