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

Change-Id: I4472644c689fa3b91e06a9069f51eb8dcb19ef7e