am 710fd65e: Merge "Don\'t try to read /system/default.prop."

* commit '710fd65e5ff42780ac5b84b17153d57a81105a20':
  Don't try to read /system/default.prop.