Merge "Fix the INTERNET related permissions" am: 65cef6401a
am: 5289cdd37e

Change-Id: I7b07ca0ef7966f0ebee17cabe2eb79c5d6381228
tree: 70fe98583abfba6dad65459f10cf75798c2e5e2d
  1. core/
  2. services/
  3. tests/