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

Change-Id: Iea1b674cefc1d63eaeb77511904afcf4fdc7639e