Add GS3 files and clean up M7 commit

Change-Id: I82b3f758cededb892f733c40245fb3b556a9df4a