run-test 132 randomly chokes due to this change. Bug: 26351700 This reverts commit adef5bde. Change-Id: I18e007264e1e8b9027d7d241cb9f0053ad8d112a