This reverts commit f73abf36bc. Bug: 27724259 Change-Id: I1301fdad15650837d0b1febd0c3239134e2b94fb
f73abf36bc