Merge "Add boot/shutdown timing to sync detailed logging" into oc-dr1-dev am: 09e1fae73f
am: a43c0948f8

Change-Id: If0848f8642cdf3610e950181143f412aebfe1ee4