Fix trailing white space, use of final, comments. Change-Id: Iacc034acd46a651c35c32f2efbc0fe5fb58e1209
bcc26c02