Merge "Otapreopt: Load properties from files" into nyc-dev