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

Change-Id: I5bb6a6074a2ac08f04147d415fb1d2bfbd411850