Merge changes Id6c00c76,Ibc74a12f

* changes:
  Check return status of ReadFileToString() in GetDeviceLockStatus()
  Validate partition name when searching for physical partitions.