Removing custom content padding

-> Cleaned up extraneous imports

Change-Id: I3f9258a893e85f9f6a7cc1eab03d4c5a3dfba786
2 files changed