This causes various problems with our testing infrastructure. This reverts commit b210026e. Bug: 22447614 Bug: 21429947 Change-Id: I57623e3d993e65b6ad89e7a7d28e9575cf638994