(with regression test) Bug: 37768917 Test: test-art-target, test-art-host (cherry picked from commit e22445fb) Change-Id: I505106ef7ab8eed1e37067b39d6ef657ee234292