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

Change-Id: Iee66b180ecec69872ac2e96bb943e9d02afc33df