This reverts commit f1c82823. Bug: 38440534 Test: manual Change-Id: I987d6a5acf159708ff45b4e154e3f775bdedbc57