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