Remove hard dependency upon BetaFeatures

Change-Id: I8a239792407cba8daf823cd1c868d8d927156a13
Merge "Remove hard dependency upon BetaFeatures"