Snap for 5590969 from 5f6e62a5b6c7f74dbb8c786c0281ef1933ad8f8f to sdk-release

Change-Id: I4ae07d5f1d13f7b6a0d0878582142bf15fb77a90