Merge commit 'JIRI_HEAD' into ath10k

Change-Id: If150e0d68ce2978e062d66435fb482cefdbad017