bug: 34254941 Test: manual testing and check coretests pass Change-Id: I8cae7ee98628ef3d69fddd6374bcbf91d8a1873c