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

Change-Id: Ibfc5cca4b48c07c2aaba161373c961cb3dfd7d3f