Merge "Temporarily open BPF maps with no access flags." am: 343158d93f
am: 742410662b

Change-Id: I878edd25c37175a550c2737efd66f9b12601e8f3