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

Change-Id: Ic0a1999ba4b41e89b3367bf8fed5c17b87532924