This reverts commit 1965af25. Reason for revert: the main cause has been fixed b/117880789. Bug: 117924387 Change-Id: I32fcf72c9262d10364dfb1e31a6eacf69652be5f