Fix minor include and formatting issues.

Change-Id: I14417b775b4d67bba8b0bbbb37fc0b37efc20fbf
2 files changed