RT: 6161 decom for relocation marmontel

Change-Id: I1e0d57e126fdc3474f75a63057bcda410195a369
RT: 6161
Merge "RT: 6161 decom for relocation marmontel"