Merge "Fix clang-tidy warnings in log_time.h" am: a36528da5c
am: 6185deb19a

Change-Id: I426e6996308bd2cf9d17670e2a3321c53a6c1ef2