Jira: [STUDIO-13891] Change-Id: I7d6705157b290d3b7d49bac47f985d31be8beae5 (cherry picked from commit 0be1e49a42e48c02258fa952b3be5c67ba2265e0)
Jira: [STUDIO-13891] Change-Id: I7d6705157b290d3b7d49bac47f985d31be8beae5 (cherry picked from commit 0be1e49a42e48c02258fa952b3be5c67ba2265e0)