Merge "Fix EntitlementManager issues" am: 943af02d92 am: 7f05bb9b2d am: 784b7a6925 am: fbc0efb4f1 am: 7975177e5f

Change-Id: Ia353f570bc9706b1d1ae1eeb3684cf64a686ff15
tree: 7d6bfe182b06a4fb1e6b93b671d15aec046d380d
  1. Tethering/