This reverts commit 09ba34925f. Bug: http://b/139257138 Test: treehugger Change-Id: Id9b612c5a79b89ed17d2205219af19788ae96c9e
09ba34925f