Optimized imports

Change-Id: I80a9974e6d2d91fda85cd116a4cbee4bdf12dfd6