Revert "Revert "Finalizing Q resources""

This reverts commit bca7d2eaef56bb0b6b8a97dc8d10d3aa23b5b433.

Reason for revert: Rolling forward for Q-Finalization

Bug: 129975435
Change-Id: I8468cc92ffa77e58b32f82b7d8eb749da66cf281
3 files changed