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

[TIMOB-14997] (3_1_X) Target the correct layer