s4-common: fix copy paste

Change-Id: I9b4951c3a162af50d5b9209984c620ed2a343eb1
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2