Merge "Clean up temporary file in ReportLogHostInfoStore" into nougat-cts-dev
am: 15068f9e4a

Change-Id: I2ce8355e4d75d4fa26dd0b0aabf92aecb0c7a2c5