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

* commit 'b39ab48964737e72db4142ad9596df73ee553623':