Merge "Add boot/shutdown timing to sync detailed logging" into oc-dr1-dev