Snap for 8005954 from 75c4bac5fb6cd83c12f587a54e136e72428cdf49 to sdk-release

Change-Id: I4066b6c57454e3286b2307bbec8115aa6c1218fe