Some small nits.

Change-Id: I35067620ef528fd80deecce3afee625edf8a9008
5 files changed