Snap for 12349386 from 72fc7a62d841269472a25cafc1abf7792bb5cdbd to sdk-release

Change-Id: I6e96da9774de29e7ed7733a4a618431ff2eb4ce7