Jira: [STUDIO-13295] Change-Id: I3b0c907ab4357d09ad592a0d937d83aaa15e8680 (cherry picked from commit 928d6b4c6a8c3ea8c9bd179c51afdb7dc55f45ce)
Jira: [STUDIO-13295] Change-Id: I3b0c907ab4357d09ad592a0d937d83aaa15e8680 (cherry picked from commit 928d6b4c6a8c3ea8c9bd179c51afdb7dc55f45ce)