am 21568b38: (-s ours) am 6869cb4e: am 12b82a23: Merge "Revert "mako: wifi: Update NV file to disable passive scan on channel 12 and 13"" into klp-dev
* commit '21568b38':
Revert "mako: wifi: Update NV file to disable passive scan on channel 12 and 13"