Snap for 11878282 from ce0da986e732682558f3494f2302fc96318c967f to sdk-release

Change-Id: I35329de90d5d17f4c8d4606f6ccdfcfcf17cc0cb