Optimize all use sections in Client

Change-Id: I6ab1d09a3e55ac7d8b25362c187969015ad1f68b
Optimize all use sections in Lib

Change-Id: I79df2962f6f2932986aae1f37ca8bfb9836be09f
Merge "Optimize all use sections in Client"