Clean up finals

b/11027351

Change-Id: I6d26191bf6da084c4aae58cf40311017948295b2
1 file changed