Snap for 5925869 from abb3a16c4986c5f7dda62580c4f53c1930d4d1b9 to sdk-release

Change-Id: I6c7517bc7c8a1d0a3292d688a9a308a5b3371640