Code cleanup.

Change-Id: Ia6ea04b83832db2f39e3168ef2596c24273a7ef3
3 files changed