Snap for 8005954 from 1e06739e0b1167c12c3de6fcdf134cfc9d5c5753 to sdk-release

Change-Id: I71e224932cb9eb4d31ccf45bf0a3c5eabede0458