Merge "Automatic timezone support on non-telephony devices"