Merge "Add support lib wrappers for clients" am: b2f3e87ce3

Change-Id: If4f081c444e653b02f08c33ebdb2725a4be3a6b7