s4-common: fix copy paste

Change-Id: I9b4951c3a162af50d5b9209984c620ed2a343eb1
Merge branch 'cm' into HEAD