This reverts commit 8584db1461. Bug: 18675223 Bug: 18675476 Change-Id: I4e25d87ac261c44b1943df832115f8cca690103a
8584db1461