Snap for 5303890 from 5272f9b017e2e32551ec53c680b9869b0ec135d2 to sdk-release

Change-Id: I1d6ca0f9fcaef85ee5d0f030be7801df6f271008