Bug: 202323013 Test: make Change-Id: I22618a57bfecd02508f2d4a53ff6c65071de2fd1 (cherry picked from commit b7509a3079)
b7509a3079