Merge "Updated non-ARM archs to reflect logging changes."