Snap for 12349386 from eb1e03308b1d4f76dd9da63845a4604cd39326c6 to sdk-release Change-Id: I718c687abceb064c03197a12e568955224f92a4b