Fixed the import path
* Fixed the import path for client and behavior

Change-Id: I3e1ac59a33c9230ed7eaebd881d0b7904174fd85
Merge "Fixed the import path * Fixed the import path for client and behavior"