Merge "Snap for 5303890 from 0b3cef8697f4ad2af9ab5efdcb2f186c28ccb28e to sdk-release" into sdk-release