Merge "Fix LoggerTest." am: a45b635357 am: 0db58bf509
am: 6207af718c

Change-Id: I9477830d834731201270cb71d78dd9065c57f897