Code cleanup.

Change-Id: I332cb633037941229163fb3bdf5fae723deb3632
2 files changed