Revert "Update for 1.0.0-beta1"

This reverts commit 6b1fd5cfa9e6ff2a1b7cdc5190ec844dacec7a72.

Reason for revert: broke Settings

Bug: 74950017
Test: revert only
Change-Id: If56a4dcac4671d8e2c5f2c0de30d13e3cf58666a
5 files changed