Snap for 8554636 from 4f62bdccde9e4cf3cc0cee85fc4dac53f6f3ce92 to sdk-release

Change-Id: Ie1eb24047d828742a8318361738849c457c085bd