Merge remote-tracking branches 'asoc/topic/twl6040', 'asoc/topic/uda1380', 'asoc...