Merge commit '5f51b61329fea7765dc92b62606f914a8b704f9f' into wlan-cld3.driver.lnx.2.0

Change-Id: I194c9503f22edd85b6541b2c155e07cde1f131d1