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