This reverts commit 863ec4b9cb. Bug: 27803922 Change-Id: I3ccf33779df580ed615f44d0410676cba972ea6c
863ec4b9cb