This reverts commit 91587ea5. Reason for revert: Creates timeouts in automated testing. Bug: 119017401 Change-Id: I0e0217d30b564d8224d73a381a34ca5394f3128c