Merge "Update annotations to spec for log"