Fails in tracing mode Bug: 32369913 Bug: 33630159 This reverts commit ce77fc0e. Change-Id: I1bdcf6ad467f2e31f9c5d0c3c987b90a4f5efc69