Merge "Revert "Partial Revert of ag/10161061""