jira: STUDIO-13884 Change-Id: I215011f419ff194f6b8e4c7ed884cba194c87d19 (cherry picked from commit fd63b1f59d88fb8e07b8ca71dfa5c01cfa54def5)
jira: STUDIO-13884 Change-Id: I215011f419ff194f6b8e4c7ed884cba194c87d19 (cherry picked from commit fd63b1f59d88fb8e07b8ca71dfa5c01cfa54def5)