Imports, configs and directories has been updated Change-Id: I570aead4e33eec05264f7dd346d05048975138ba