Merge "guard against nulls in LogMaker" into oc-dev