This reverts commit 67f28e74. Reason for revert: Testing fix for b/191191441 Bug: 191191441 Change-Id: I15ca686c7c44626b734ba45e785adbe66fcf624a