Merge "Rename SimpleTimeZoneDetectorStrategy"
am: dd69aac761

Change-Id: If356ea6ec3097ef03a64ef89f39e735fa1363ea5