This reverts commit 6262f224. Bug: 137819199 Test: manual Change-Id: I10800ff8f76fa68b9a93c935d14c5ade68504917