Merge "Rename SimpleTimeZoneDetectorStrategy" am: dd69aac761 am: 65eda642e7 am: 6281a114fa

Change-Id: Ifbbca6040932af6068fc526c6d797818f87d8d05