Merge "Switch settings to use TimeDetector" am: d32eee26e3
am: 5ef64ad89b

Change-Id: I8901a6595677380013cc3d063426a4dfead18b97