Snap for 8782634 from 3f7de11b7b6c1b2ea6aaf6d9edabf9f23c669d8f to sdk-release

Change-Id: Icb468ffd722dc616ad934694f9f27d7bc78a61e1