Fixing broken tests on API <= 23

Test: Updated tests
Bug: 34774561
Change-Id: I766e0ace2bacf2c112366aedb2e1746832096dab
1 file changed