Optimize client imports

Change-Id: I370b90a4f7e1861b0b867da0efc98c88651c3c2e
Add missing imports

Change-Id: I96db4a0ebfe5a027d5dbe5b38a1a9411b05dc6f2
Merge "Optimize client imports"
Merge "Add missing imports"