[TIMOB-14997] Target the correct layer
Merge pull request #4638 from vishalduggal/timob-14997

[TIMOB-14997] Target the correct layer