Merge "Revert "Load persist props before starting apexd.""