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

Change-Id: I156eb4eca6316c595187020af8956fb7f70fdd16