Merge "Base: Add more log macros" am: 58af713d8a am: 9148006e85
am: 4939e19354

Change-Id: Iafa634da74d64c8099425201b15d5dbb90434507