Snap for 7242881 from f859dd16035e320ce10b678807f3209113376b41 to sdk-release

Change-Id: I5d7a39ad1caed1557acbd09be3e2506b3ecd7a45