Snap for 6660490 from b61406d10fab44d7cd9e1796f093ee90eb9bf828 to sdk-release

Change-Id: I6d74c022ec246f594e53dc39c71c3fc15ea975d6