Snap for 6686656 from b734cfd607de2050b9c477d2ede4941bd549e51d to sdk-release

Change-Id: I4f0631a90b8db6c862ee2464bece4c191617d7fd