This reverts commit 7e31f421a5. Bug: 33534933 Change-Id: Ib173f6b1e36a79deafc3592785195693a6779471
7e31f421a5