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

* commit '96b8b3f5b1f83ab6510b831f460445855668c2d1':
  Don't try to read /system/default.prop.