Snap for 11662267 from 89caecdb592e2d613cd370ec74bae3e8dcafee61 to sdk-release

Change-Id: I73e58d1f37b374cb1eb86b222d6938c77641e895