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

Change-Id: I82ab6403e7734b04230a2b2f761eb4f25e161e51