Snap for 10453563 from 0d34fc6e420a76bcda5cc6a96aa922a5f188de7f to mainline-sdkext-release Change-Id: I65d7d232478fd3e9aa50896945c9e21f65b81f32