H-4: Rename Close -> Lock

Change-Id: I07dec52b95f1439030a6661afa15d6ad733a60d2
Merge "H-4: Rename Close -> Lock"