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

Change-Id: Ia9c83c96b082b6c14991b45a9f5c77585aa6ed2a