Merge "Make REVOKE_WHEN_REQUESTED a SystemApi field" into sc-dev