Test: the new test passes Bug: 37235425 Change-Id: I1f9f17ab58c7359d5269d1ffacee2ebad4974d5a (cherry picked from commit 4e38daf3)