Snap for 10399941 from ea3f06bca913055182ce7b5ba58e588e324301b2 to sdk-release

Change-Id: I20cdcc3c985ddf2af650296108630899d6235331