Snap for 4953200 from 92fe5db069b92f149c545fbb4114cc5b26bc97b2 to sdk-release

Change-Id: Iad142ec6fbebe3bb87fa19153598862280ea48a4