[automerger skipped] [DO NOT MERGE] Better timestamp for shutdown and startup events. am: 8d83364c5f am: ca134de916 -s ours
am skip reason: subject contains skip directive

Change-Id: I4a5d23964a787a4cd5158754421ff902463b401d