This reverts commit d6d49e56. Bug: 29083330 (cherry picked from commit f102faf1) Change-Id: Id0c921bd6fe422159f8daa598dc8e7c9ed6eca47