Merge "Snap for 9550355 from bdf5a578b0eb019202ea6fdcd5b3f9163ff7085a to sdk-release" into sdk-release