Snap for 7110675 from 855e5258c3e0bdbf228cff4adf2888fc32442dc7 to sdk-release

Change-Id: I90645728fd1934157c876f0a962ded0ee8df297a