[automerger skipped] Merge "[DO NOT MERGE] Better timestamp for shutdown and...

[automerger skipped] Merge "[DO NOT MERGE] Better timestamp for shutdown and startup events." into qt-qpr1-dev am: 0454ccde am: 7c113eb0 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia017005e37a7d56343033d8910ee251c7250ba2a