s4-common: Update from cm ( missing from commits )

Change-Id: I4b556f8b4bd73acfdeaf7dcaa9a4fbcab55ae1b8