Merge "Snap for 8952093 from e19d921547f68a8cf95ccb799828b45c2503d7d0 to sdk-release" into sdk-release