Make opting into beta/alpha work on localhost

Change-Id: Icdc2a596b9ded6c844c419807da2c759af147ea4
Merge "Make opting into beta/alpha work on localhost"