Snap for 11785460 from 92b26b56caecd76b94a138c02c5efe5d54428cde to sdk-release

Change-Id: I7f991a936bf7220f748e2774e9a4fd31900397f4