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

Change-Id: I7cdf54c423c6aa35fb061af31a0bab42614b2768