Snap for 12349386 from 49476d88ce4ad8bc7333a41088b6d58e0771388a to sdk-release

Change-Id: I967848fd4b6d841345cd8cc8ba8099695fa2ad2a