Snap for 7110675 from 59c736f9a99486f3bf29cbdae4a3845cd4e6ac3c to sdk-release

Change-Id: I53f648b1578a80a895983674efb6abb7adac0655