Merge "Log timings for shutdown stages" into oc-mr1-dev am: fe97799d5d
am: 34cac26ea4

Change-Id: Ifedc47b10e7542a0f28bbee1ac00490513cc0e5f