This reverts commit f31ac94a. This reverts commit 2f0674a7. Bug: 184003133 Test: N/A Change-Id: I6bd807ce0df6cd81e44bf89918ac4b7b01c27ae1