Merge "Make service methods public to access outside of package, cleanup bt code"
am: 855241be14

Change-Id: If8121434b3c90b2952b91f99cee7ffe311912395