am de1c33cd: Merge "Fix bug in removal of *.flock files." into mnc-dev
am: f12e8b77c5

* commit 'f12e8b77c53846e714a1cb3f7deae29766704fcd':