Snap for 7183507 from b054ccfb127046332d065bcff97b18cedf9484ce to sdk-release

Change-Id: I022bbeea9716670f400e88923c4e69cb649e388b