This reverts commit 90c6565741. Bug: 3378444 Change-Id: Id845bc0bc213f18c73fec12e6a2084cb2075c2d9
90c6565741
cd08ada7
67c7a4ae