Snap for 8005954 from 95ebbaeb2d41f28adb4c387b9f93787505ff12a8 to sdk-release

Change-Id: Ib10a3ee02db3df46c0429e0c762e6478ca1c5670