Merge remote-tracking branch 'asoc/topic/samsung' into tmp