Snap for 13159979 from 8a8545d69b730a97c97416746cd3956718a05b99 to sdk-release

Change-Id: I00ef6f075977fa481edc73530eef3f34a73743ca