Snap for 6533464 from 7e445b763fb9b2704caeed57e5c58aba8b3a1e20 to sdk-release

Change-Id: I0476d73ca54e5500741cd23d7d817cbdf785d8f2