This reverts commit a704eda0. Bug: 27417671 Bug: 30500547 (cherry picked from commit 69bf969c) Change-Id: I4354d1c9f1c554f054e99efd7aa52d8a2c5d402c