Merge "Fix Wi-Fi Assistant padding" into lmp-dev