Merge "Avoid use of TimeZoneDistro.equals() method" am: fe0b43cb1e
am: 6b5d71f7e5

Change-Id: Ib4d97f72a9fa936beb47267c9e9a888e306ed0e5