Minor cleanups.

Change-Id: Ida4866997deeaa1bc2cebd6b69313a05ac82e457
2 files changed