This reverts commit 9e28e15c31. Reason for revert: reapply the change Bug: 317429316 Change-Id: Iec7be68fbd3099d65c975e7f625084c9f112bb36
9e28e15c31