Snap for 8952093 from 1627ed0205f10e2f0ee410d19044d66d677b2301 to sdk-release

Change-Id: I14b4cbce5c8d6e52aa97c5582178a6c943040580