Bug: 216095923 Test: existing CTS tests Change-Id: I73d12ad84e2dce108dcc923c6ad400a2a1bdddd6 (cherry picked from commit bef5d91b)