jira:[STUDIO-9807] Change-Id: I3d432734a6b3f494ed79d816b754d6d1cbcd3a0f (cherry picked from commit d134b66446e5a9561152b6545fe79d19a70dddfe)
jira:[STUDIO-9807] Change-Id: I3d432734a6b3f494ed79d816b754d6d1cbcd3a0f (cherry picked from commit d134b66446e5a9561152b6545fe79d19a70dddfe)