fix typos and add missing imports

Change-Id: I24edc8394f9f1187e0b969be455fea093eb33c2f