Merge "Do not archive the logs directory"
am: 11c7f85510

Change-Id: I7da40678a6dc6f587e4ee76db54d248feef0c448