Snap for 12446955 from 0edbf637ec494a6ebd607463d14116ff89a921e1 to sdk-release

Change-Id: Ie55421361dde0f8bc5ff9f4a2d66005143701634