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

Change-Id: I2aa7061ca04ce8ce52ac178450e4fbdb73f5df9b