Snap for 5925869 from 0e06489f538d99656ba2594d1d1aa6f24ba825f4 to sdk-release

Change-Id: Ia55863fb0c1cb771d75049492c85858f59e0c746