style fixes for pre ics

Change-Id: I3f8f5334971202793bf376348a5c6b277f272786