Remove unnecesary imports Return missing logging and sys imports Change-Id: I50923c9d42b94cabc8fbf3de7391bd03d2d14f12