Snap for 12472708 from 97e43a42b230e3169cf030b82a9b4ba1fd5079ed to sdk-release

Change-Id: I1a09ec4677b75fc79b1ffac0faacd2aaa988d0d3