Made import shorter

Change-Id: I8f00d82a7f6288ee285bc02eba6ee73999908440