Bug: 33853287 Test: cts Change-Id: I844a9aec6e37e306a77eee0644a774f6470cf5df (cherry picked from commit b004b513)