Merge "Replace the permission of internal connectivity checks" am: af0a3e0525
am: f7534cc2df

Change-Id: I461936789b24940cc81146e9d0fc6c4c455206ed