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

Change-Id: I255cf10a52d193addc75a16c77f030a531ae2a87