Jira: MAK-2011 MAK-1988 Change-Id: I411bd185c8cb9f314b74ca91ad5fa303562ed4e3
Jira: STUDIO-3151 Change-Id: I6ffd236faea7de9f1e35b77f818f926f2477939a (cherry picked from commit 5591f9d472bc7de45cc73acdd79e09bfc2549d89)