Update BetaFeatures and Cirrus

Beta is coming along so Cirrus can be a beta feature!

Change-Id: Ic94b38f56bf4e3064769ea3224b9c6ed5099f0a9