jira: STUDIO-8928 Change-Id: Ia64a96e7e13e65d8be85fddfedcfdc4e5cff4ed5 (cherry picked from commit f090726830ea0490994b62c93c93e18ead731681)