Snap for 7110675 from 21474550bc37ccb8524dc49c702b1f735376f5eb to sdk-release

Change-Id: Ie5ee0b9b11b5aee0a7a5baa5c1e0cab0faa62fc0