Snap for 12254644 from de03f922f3de19e1c1116856dc7898bac829055e to sdk-release

Change-Id: I6aa871aa61c439b68bb9aaf148d9c6de93146cf6