am 2ad38174: am 9f57c438: Merge "portability: Fix a bug where long AF callbacks caused ISE timeouts" into lmp-dev * commit '2ad38174':