Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev