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

Change-Id: Ib18375fd6bef00321b5ee7b2e866554b389ffa58