Added s4-common from muppets

Change-Id: I29fcb9fd1b5e32593729cbdf1f338104d779efe1