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

Change-Id: Ic5953a6df37557b0c3af54931639aec52878e0ac