Merge "Load persist props before starting apexd."