Snap for 7800789 from da98e6634288f53f842d0c7979f2014a9feddd43 to sdk-release

Change-Id: Ie14a8c7c3b96ba960e100d3bbecc186923d9147f