Merge "Load build sysprops early"