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

Change-Id: Ia21abee80415db4f9c14bae2614dc8b67d671ba0