Jira: [STUDIO-13934] Change-Id: I3818c3881e8a926209f2bac321550f3c7a1a9f0d (cherry picked from commit 5bb1c2e66ad5bddfcba6898d9bc330217e912e48)
Jira: [STUDIO-13934] Change-Id: I3818c3881e8a926209f2bac321550f3c7a1a9f0d (cherry picked from commit 5bb1c2e66ad5bddfcba6898d9bc330217e912e48)