This reverts commit 6858e978. BUG: 126338853 BUG: 124355112 Change-Id: I08f031e4c09a32f884d5546cf2094befb72c2821 (cherry picked from commit 33f4f32bf7bd340bb38b70660d9765160074f9cf)