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

Change-Id: I30b49d87ad875b6a0bc30177959a2197cfc5a0b8