Merge remote-tracking branches 'asoc/topic/davinci' and 'asoc/topic/dwc' into asoc...