Merge "Merge "Revert "Load default prop from /system/etc/prop.default"" into oc-dev am: 642ca632f6  -s ours am: 869f48a256" into oc-dr1-dev-plus-aosp