Snap for 8005954 from a5341a6140f485bdd0a436e1aa4bf610cfd869a1 to sdk-release

Change-Id: I9916c866c1a944938ffb83989a5edbd68b6d86b8