Add tests for ag/5513691

Bug: 119124086
Fix: 119124086
Fixes: 119124086
Test: tested locally on hawk. Test fails without recent changes.
Change-Id: Idd5cd8c7558def9da7533eea05814e3137c6f13f
(cherry picked from commit d15ae4cb258f07a4de2f8da005eb70a9b72e0dd4)
2 files changed