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

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