Merge "Switch settings to use TimeDetector"
am: 5da6521458

Change-Id: Ibcdf80e3616fd5f3093fbe2bbe7fd4b26576734e