Merge "Freezer: fix exception when parsing /proc/locks" into sc-dev