Merge \\"wifi: allow config of default+verbose ring buffers\\" into nyc-mr1-dev am: 88442c1fe1
am: d526329639

Change-Id: Iad63f61751702ff4723d88ce19eeaef3dcb3a317