Cleanup based on comments.

Change-Id: I2d261b3cd240b890001dcc7d2a849cfdc34328bf
6 files changed