jira:[STUDIO-8650] Change-Id: Ib9270caa57f4ce63f0ac1a0ace5c2a51b3b6fc14 (cherry picked from commit 7ff9b96837d29bfed1ca21b448332feafa3a96a7)
jira:[STUDIO-8650] Change-Id: Ib9270caa57f4ce63f0ac1a0ace5c2a51b3b6fc14 (cherry picked from commit 7ff9b96837d29bfed1ca21b448332feafa3a96a7)