Bug: 235952749 Test: verified by hardware engineers Change-Id: I1341b02c0a38131c225af28223d3f760c6b3590b