jira:[STUDIO-11304] Change-Id: I45663121431fadcafed232c319ff69d6c616eff2 (cherry picked from commit baabcdd654327085d33c6b2067f7281af07e3b4b)
jira:[STUDIO-11304] Change-Id: I45663121431fadcafed232c319ff69d6c616eff2 (cherry picked from commit baabcdd654327085d33c6b2067f7281af07e3b4b)