This reverts commit 9ed7cb40cb. Bug: 111548033 Bug: 121222038 Change-Id: Ic9c85628c45ea5327d0d3b6969034c13789b920c
9ed7cb40cb