Backport updates for repo management state

Change-Id: Id227b22670efb211c15645a3e2b95fb215fef91a
Related-Prod: #PROD-28395 (PROD:28395)
4 files changed