Updating behaviors and clients as a result of client lib refactor

Change-Id: I7ad018b96dd33088931843dfd6ff96432e29eea6
Merge "Updating behaviors and clients as a result of client lib refactor"