jira: STUDIO-9747 Change-Id: Ie28901288c166cdcd7403311cb467b72453c2ca4 (cherry picked from commit 0b3cd958d5b573276488c477540b122f116099ab)