Jira: [STUDIO-13185] Change-Id: Ib8b5905c32f83b1f849ad4ed327c9d77826d6a18 (cherry picked from commit c603e0f88be71a301ed2fc7f6fff2a34398b6708)
Jira: [STUDIO-13185] Change-Id: Ib8b5905c32f83b1f849ad4ed327c9d77826d6a18 (cherry picked from commit c603e0f88be71a301ed2fc7f6fff2a34398b6708)