Snap for 5925869 from bf52788ad59868e6da6265310b192f95e5074db9 to sdk-release

Change-Id: I7fc811138a1c0bc338ac05492753c2838f3eb25e