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

Change-Id: I07d6c4245f9ed59485e21fd737e42886f4c779b6