Initial push of all the customizations so far

Change-Id: I81cbb7cdb3b774d4851b8e3b1a09369647abe69e