BUG: 32069168 Test: manual verification (cherry picked from commit 281389ac) Change-Id: If5dee52a99c03a00dada22736c09d953dc0b66d1