Snap for 8005954 from 86898edaca2ebd5a8a93b827ef961e6077781890 to sdk-release

Change-Id: I50051d343fac975faa51c03a502ce002a52dee22