Merge "Fix EntitlementManager issues" am: 943af02d92 am: 7f05bb9b2d

Change-Id: I0fef76b2fa00757afc1db9a073ad9e912ca98b19
tree: 629ac065e20798e24c806a39e6e6f418ff67103c
  1. Tethering/