Snap for 12349386 from d6176a2bba650be0e7fcf1d6a522a37c5d2ab5c5 to sdk-release Change-Id: I16887a89c8145cb6ff23cb640d5ff9332adbbcf8