am "Cumulative patch from commit 2c0efd9e49b15da163cee659409eee85390620c3"

merged from partner/m-wireless-wifi-dev
216983b Cumulative patch from commit 2c0efd9e49b15da163cee659409eee85390620c3