Start ICS header cleanup and finish type matrix.

Change-Id: If65f96f08c958d330862c543d85dd9d4a0f90e06
1 file changed