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