Optimized client imports

Change-Id: I71c2f0b560004065a6768fb4b910dd0b758fdb97
Merge "Optimized client imports"