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

Change-Id: If973200321c88c555596bd58fd9137c05f938556