This reverts commit20d1da2b62. Reason for revert: Based on bisection, this is the likely root cause of b/186904496 Bug: 186904496 Change-Id: I0eaa026b52610d7ef4543c32791531971e68f8e6 (cherry picked from commit30e9ba1e52)
This reverts commit20d1da2b62. Reason for revert: Based on bisection, this is the likely root cause of b/186904496 Bug: 186904496 Change-Id: I0eaa026b52610d7ef4543c32791531971e68f8e6 (cherry picked from commit30e9ba1e52)