Cleanup of all files in the component

Change-Id: I5a63e55cbd0f52767d89191302424465b7e10474
Merge "Cleanup of all files in the component"