Snap for 7800789 from 2f9ee13f4e94de1b5a99de4e191391f912eccfc8 to sdk-release

Change-Id: I7cc7dfd7a4aee384ee46a2287fffed526579a22a