Bug: 338254085 Test: Verified on device Flag: None Change-Id: I5a821a89df80ce43b73092db43af3dd8d53d81f4