Snap for 6290619 from a15aee3613733ea43d1afe2b25c0ee6b37ebe8b4 to sdk-release

Change-Id: I30dbe2b00ba36e1359851c88eed08700ba84b9f3