Snap for 12815566 from faef291f4cceeb1630a5aec2995763a5da5a118c to sdk-release

Change-Id: I91501989f1c4e059024c93c2517923d1243f4e8f