Remove reuse of TimeZoneDistro and equals() am: 6e484a7cdd am: ec088d5262
am: 7af0e01003

Change-Id: I3b197ee87bb84c2d0d11fbc0381bc43abe43f7b8