Merge "DO NOT MERGE: Remove storage grant to the content capture service." into rvc-dev