Snap for 8952093 from ed00fdde8d205a82ca86b68496dd1d062ca8f0fd to sdk-release

Change-Id: I31c4bc5efcea9736217e41d3ab499484963d39d3