Snap for 7593232 from 3f23f3605146a15356f8f9878468166830044f50 to studio-2021.1-release

Change-Id: Icee4a5ee99816c50a62cd262b2251eca8d7ab633