Snap for 13198286 from 42b743340a5ea7d7cc676776f5b7ac51895f8d96 to sdk-release

Change-Id: I1ba1502c57acdb7b1b6504c696494352f7ec08d5