Merge "Fix log function for potential overflow" am: 2e5c7798e1
am: 10155def9a

Change-Id: Ia91d711168bf9e69c583b1a933d69de94916b449