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

Change-Id: Iff38c8efc74c821ed473f50850720e6313244296