jira:[STUDIO-4344] Change-Id: Ieb1f40e03fd4a266b768f8b97e28328858fe63cc (cherry picked from commit 621d4319760cea15e224a9927768bb643b852139)
jira:[STUDIO-4344] Change-Id: Ieb1f40e03fd4a266b768f8b97e28328858fe63cc (cherry picked from commit 621d4319760cea15e224a9927768bb643b852139)