This reverts commit40ede29ed6. Bug: 74068582 Bug: 80444486 Bug: 80316870 Bug: 109803325 Bug: 109642189 Bug: 109660260 Bug: 109649585 Bug: 109647120 Bug: 109648512 Bug: 109648513 Bug: 109647122 Change-Id: I0e50ceebeaecae89f461f541450e24d9c148527d (cherry picked from commitafef5daaf9)