Add tests for ag/2086796

Fixes: 37192695
Change-Id: Id0b3cbf986490d64cdc5592541dee1b004853503
Test: added
(cherry picked from commit cfe4ffecceee005ff6bc79dcc1637f44f82bd43a)
2 files changed