Fix when system variable not found

Change-Id: Ia508d146bbb2fdb75d5ba66b6791b31566dc6522
Clean up imports

Change-Id: I3bbf04b911f849160c37f349c28cd6b26078b972