Snap for 11871564 from 919e10356b0288a9650a4dacd9ad98c17b264c53 to sdk-release

Change-Id: Iaa7408e4e371362df903066fbc4a72d19d425a04