Fix broken unit test done by ag/1729776, and added unit test.

Bug: 33740063
Change-Id: I7f87502e390b02eff1b016f24161f4250969d4c2
3 files changed