Fix last commit errors

Change-Id: I37552897a2b142ce0ada987b4e8ace43b1337099