Replace deprecated getPrefixedId in Repo

Change-Id: I6b59524a81a37f198d1f60c7ade446395cb6f5fe
Merge "Replace deprecated getPrefixedId in Repo"