Merge "Fix the INTERNET related permissions" am: 88fb51277b am: ddd4e08d2c
am: 50c9cca36d

Change-Id: Id14b54002f7b3496df9e7943a127f63dcf4e82b2