Merge "Log upstream network suspend/resume callbacks" into oc-mr1-dev