Tests for ag/22688474 Bug: 267060171 Test: tests run Change-Id: I35ba4652a125c8c83e18138f0fb0a51f3ef65b73 (cherry picked from commit 6a19675b)