Merge "Allow overriding the log path." am: 11295b7f8b am: 23b37f43b6
am: 97e463265d

Change-Id: I4525b9b3726615c7b5a87b373a3fa9edf6cab0b2