Merge "Helper classes for IpcDataCache clients" into tm-dev