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

Change-Id: Ib3ea34f917cac068acb25baa98df13feffdc2cb9