Original issue will be fixed with CL in same topic This reverts commit d70feb23. Bug: 71694437 Bug: 71692657 Bug: 71510789