Merge "Fix thread booster" into oc-dev am: 4c1209e00e
am: 2bdff7d64e

Change-Id: I3dc39403e74581946f90f0d9b21e981694e752ab