Merge "Bring Telecom logic into agreement with Bluetooth" into pi-dev
am: f44285a112

Change-Id: I65acb0d60b1dcb0c4e741db2090d1d6edc550242