Merge commit 'f15cd6d99198e9c15229aefec639a34a6e8174c6' into v.4.17-next/soc-test