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

Change-Id: I8c263ce15bf29b8a14c862d9acae377ba9be77c3