Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-next