Merge "[DO NOT MERGE] Better timestamp for shutdown and startup events." into qt-qpr1-dev am: 0454ccde27

Change-Id: I2001acd720ad2bad427449393375d012720e752e