Snap for 10453563 from 06387f8b991242b15b54a46445407306b5e34764 to mainline-sdkext-release

Change-Id: I74b2c27641666e31a4eb9366e57178d56c5f5143