Merge "Base: Add more log macros"
am: 58af713d8a

Change-Id: Ia8a446e8e2609f2d7e31bcfb1eec83fc82bbeebb