Snap for 12291954 from a766a35b0cb2092ca475248332bebe24791adbad to sdk-release

Change-Id: I94530467ae2e2af0aaa9c4f6c4c5fe53938bda0e