Merge "Log failed load_properties_from_file calls." am: 57513bd5a3 am: 9abb85ebe0 am: 6d60731271
am: 5c54bb548a

Change-Id: Ie392c70cd6117fcdb7f36dd0bd77f59f56e846bc