Merge "Base: Fix logging_test" am: 3b80e5bc9f am: e79e419212
am: 5add4087c2

Change-Id: I6c7c88fbe021c21760a3dd273a99eebc9e49aa6d