Snap for 12349386 from 4434f697de370a184cc6c37124e36022b98e9fc3 to sdk-release

Change-Id: I4e8ff4f17ec3f5f4cd93473dd80598140d2d1780