add this imports back for testing shutdown problem

Change-Id: Ib0a22a9ab03513ca36e3f35da07fd09d4559cb85