Snap for 8023979 from a2856ce336c5586a897737eb74d172e8723451b1 to sdk-release

Change-Id: I52f867991d3e69cba31db4f077781fb4ec096b31