Snap for 12291954 from 72badc22fd494e757bf91d2e0c2b3501d81c7c65 to sdk-release

Change-Id: I6c41e6a7055156307bdd25d672d053bdb7460a06