Merge "Tidy up changes for TimeZoneDetectorStrategy" am: c5725ad0a7 am: 4d5ada2838

Change-Id: I4d4fe7ffd6312456210774a831e0c0e7a3e8aa6f