jira:[STUDIO-9973] Change-Id: Icca959d732f98e34b0a83fc2971c70b64d393d75 (cherry picked from commit e7454fa47d09c529db3262faf19e2e2f22bdb5d7)