Jira: STUDIO-13132 Change-Id: Id754862b2c2cee4712c51a1080ef99295e588306 (cherry picked from commit b2a6871ee92707d44db123ed84c99d2544d8fd7b)
Jira: STUDIO-13132 Change-Id: Id754862b2c2cee4712c51a1080ef99295e588306 (cherry picked from commit b2a6871ee92707d44db123ed84c99d2544d8fd7b)