c5e3f9463d
This makes it harder to diagnose problems. Bug: 117888000 Test: all tests affected by the change Change-Id: I354e86af0929531653cf59ce1eb6435018c20e1a