Merge "Bugreport: Adding eBPF maps content to bugreport" am: 2a1310d030
am: 31a2a8c836

Change-Id: I25aa12a2775cb3446bc66e54666bc358f012c2f2