Snap for 11211409 from d07aafe978c88aad2ce44dfb88619f0afdaf13c9 to sdk-release

Change-Id: Iee8bc88a0ee3cbdfdad87aa4bba054f4e89c5694