Also features some comment typos and import re-ordering. Change-Id: I32cb14419d7d349064032718469daf62a0a72e3a