This reverts commit 17e5dce511. Bug: 28694324 Change-Id: I6d89bc26cb429b195c9bcf640666c495617257b7
17e5dce511