Snap for 8096610 from 83cb750fdf8718b574f46ec672568de012ce2e7d to sdk-release

Change-Id: I82b3948051add64b346ec15652d406d962d6f13b