Snap for 6533464 from c6660becea79adbb9e93a4826f87bf2633ebe2fb to sdk-release

Change-Id: I93a93d549ec52755c73ce8d6d63d81d9aa9f9f74