Merge "Conditionally disable TetheringApiCurrentLib"