Merge "Hard-code apex_available handling for the btservices apex" into tm-dev