Merge "LockAgent: Refactor transformation code"
am: e07c0cffe2

Change-Id: Id8127faa3f26748a76983a8e3c15a2f0c25dcbae