Merge "Merge "Clean up temporary file in ReportLogHostInfoStore" into nougat-cts-dev am: 15068f9e4a" into nougat-mr1-cts-dev am: bb4dff050a am: d02a2e64c9 am: f97912a829 am: 20969364d0
am: a8660c36d6

Change-Id: I412a50fdfd6bb17f718ce112dfc67f8461cea675