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

Change-Id: I396b3204fd72605f47a8866e0dc7958ae2216d1c