LTR Client code refactored

Change-Id: I62a02dbc7e7af7010dcdd26577a88d394d99ca90
Merge "LTR Client code refactored"