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

Change-Id: I6b598fa64fde1ad0906fd14b95bee8ffc9ef4f95