Follow our own s4-common (HTC≈)

Change-Id: If228334101f869f342d75c5c546cae57858325bc