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