f36726e58a
This reverts commit 7f6f7aad7b.
* Fix forward at ag/32331020
Bug: 399037701
Flag: EXEMPT bugfix
Change-Id: I48079ecb8232bc1026ba389cebe8ddf7d32b71f0