This reverts commit e94ac2cc. Reason for revert: Beta 1 snap is done. Bug: 154871288 Change-Id: I1601da80b5c429682ec120ae9069b3b5a71b0ae0