Importing from trove-client compat

Fixes bug #1250237

Change-Id: I7a67fa7e2ab34c960fed908090edb05059ae74e4
Merge "Importing from trove-client compat"