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

Change-Id: I17a6c6a035e6e85777d0f14db819452d770856ae