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

This commit is contained in:
Matthias Brugger 2018-05-14 12:22:03 +02:00
commit 0afd32c6bb