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

Change-Id: Ia4b5e3da52fabae83defcca5ab171ee46dfc12bb