Fix multiple inclusion guard in repo and client

Change-Id: Ib7cc63bc12d998dde94984a38c7257b3bb695054
Merge "Fix multiple inclusion guard in repo and client"