Snap for 14786848 from 4f0a417267b8255873d0c667967eda0d20cba5be to 26Q2-release Change-Id: I47a81fd5ed5d14678eb8525576069d116e653b1e