Snap for 8952093 from 2bf063f3221818100d147f812048c081bb4eee77 to sdk-release

Change-Id: I89b859674a47c2744f6350cf97af3e54848303cd