Snap for 11878282 from 2f2f41f22e56fc76c567a612b7fdc80629f4e602 to sdk-release

Change-Id: I7f545892582f18c1b761e4fb3d1e45cdb8e45006