Merge "LockAgent: Refactor transformation code" am: e07c0cffe2
am: 14d72a73d9

Change-Id: I57d51ab8b0aac047006e03e18e0f681a6baa099d