jira:[STUDIO-13733] Change-Id: I017268520f522773decf68be701c9faa819af8b8 (cherry picked from commit ba16e21702719084d8af2bb8fe88fde290d5763b)
jira:[STUDIO-13733] Change-Id: I017268520f522773decf68be701c9faa819af8b8 (cherry picked from commit ba16e21702719084d8af2bb8fe88fde290d5763b)