Merge remote-tracking branches 'asoc/topic/da7218' and 'asoc/topic/da7219' into asoc-next