Merge "Clean up temporary file in ReportLogHostInfoStore" into nougat-cts-dev am: 15068f9e4a am: 0a31ba7ce0 am: e5eb072e1a am: 6947d73caa
am: e5580eac53

Change-Id: Iefadfb8d4c98e451f9715d799ea7907e7b3449fd