Merge "TimeDetector improvements" am: 6e3020490d am: c72f796176
am: c186f60e8c

Change-Id: I544b8e79ae31a478e3a8bad171db6e2bde63afff