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

Change-Id: If64cb3a4b75de5e4bfb052cfbe098bfd53b057c7