Snap for 11541002 from 38a09d88dc242b66a14311aa32ad57cc85d53fb9 to sdk-release

Change-Id: I09fba02f2399bf84b2f6bd39f011d75848ce6000