Snap for 13198286 from 8208b7200aaaf1b6c610610a8bea4569f082bd85 to sdk-release

Change-Id: I984bf4bf959f51dbb767aaa6362c35ba54aa0d25