Fix out-of-sync docu in Client/Repo Store implementations

Change-Id: I19e4f6167b9bb23dd0504b9678c2ae5339dbb8f4
Merge "Fix out-of-sync docu in Client/Repo Store implementations"