Merge "Put uptime into bugreport header" am: 7938fa4bb0 am: c9287b7231
am: a34bb42274

Change-Id: Ib2c46b11a2818fc54ecb2159f76bb48b79563b44