Bug: 30627598 This reverts commit 19886dbe. Squashed reverts of subsequent partial fixes. This reverts commit bad475a6. This reverts commit 0ba0c7d9. This reverts commit ddb8afec. Change-Id: Id94af5ae56a0335f9641a79c885cc75bba971713