Snap for 8564071 from ad9c52cd7732100473a04ace1dbb8cda13377c01 to mainline-sdkext-release

Change-Id: Ie6c0278728ffa8d3cff78a5ff676f42155ecaf53