JIRA: [STUDIO-13676] Change-Id: I5c2712ade24d20d361d00a0b763dd16479aa5fb1 (cherry picked from commit 7ac3c82fbaf0337351d41f5d65c2ae088f755744)
JIRA: [STUDIO-13676] Change-Id: I5c2712ade24d20d361d00a0b763dd16479aa5fb1 (cherry picked from commit 7ac3c82fbaf0337351d41f5d65c2ae088f755744)