Handle v2 resources in client state

Change-Id: I656dbd969b3e785293439b71bb3c9879f4a0e742
Related-Prod: PROD-19736
3 files changed