Snap for 15081330 from b091e44c75fed1a35cef3774cf987c1b8fa68e4a to 26Q2-release Change-Id: Iec842075aaf92859b6e42b7356814bc992055162