Merge "Base: Add more log macros"