Merge "Log failed load_properties_from_file calls." am: 57513bd5a3
am: 9abb85ebe0

Change-Id: Icebec299d2f3f5b02654bba12fdd28ea0199a61f