Support gradual feature rollout

Test: atest unittests
Fix: 379742333
Change-Id: Idacec2c7d422faa42a9897cf0f67b0a741c840d8
2 files changed