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

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