Merge branch 'topic/hda-ad-remove-static' into for-3.12