Snap for 10448490 from 9ecffe1d169a06dc96845ee7ef2420911d927693 to sdk-release

Change-Id: I43475689007c245d8523a4f81c4cea12a5cc8f79