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

* commit '4048e0911244304e0d31cbc66531c26e99ee7752':
  Don't try to read /system/default.prop.