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

Change-Id: I15ffb93172083d2b0607ebf1fa5cbb942ef26c1d