This reverts commit 3af0fe0c9d while investigating issues 13751080 and 13883978. Bug: 13751080.
3af0fe0c9d
3fb2b713
25df673b
1b51c9cb
4701b51a
bb87ac7f