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

Change-Id: Ica37157dde804359b4b765c9bdd6234260b6e97a