Merge "Do not archive the logs directory" am: 11c7f85510 am: 27f08495d5
am: 29243a834c

Change-Id: Ia532de7ae1e228f168be3ec0109421d900f4b837