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

Change-Id: I9e721dd628c4b492a8a1524415f32a1b5429e0ad