JIRA: [STUDIO-14861] Change-Id: I72e9e77c0e81e9cf64de7258ca09c225d5c3f807 (cherry picked from commit 9861c3d6bcd7e2720d1fccaacb820e13b5d7adb7)
JIRA: [STUDIO-14861] Change-Id: I72e9e77c0e81e9cf64de7258ca09c225d5c3f807 (cherry picked from commit 9861c3d6bcd7e2720d1fccaacb820e13b5d7adb7)