Snap for 4953200 from f663790c00a39f17a529acb1bfddd062655676a6 to sdk-release

Change-Id: I122e0dad85224e581afc558835dd2745b1e3f7c6