Merge \"CTS: Replace deviceSerial with startTime as MetricsStore key.\" into nyc-dev
am: 6a2a6975fe

Change-Id: I93ce754df192136790ef098309dc9826890bbb46