This reverts commit 5b7337f77c. Bug: 63579299 Test: none Change-Id: Ib617c4edfc16eeae3507b59b2debeae4f8bbf9a5
5b7337f77c
6ea61f9c6d