Merge remote-tracking branch 'asoc/topic/symmetry' into asoc-fsl