Merge remote-tracking branch 'asoc/topic/ux500' into for-3.7