Code cleanup.

Change-Id: I5469a2c826c054f20e045ea098bdbcad9e11b17b
2 files changed