Merge "Change default log location per logging guidelines"