aml_tz2_303900110 (9891172,com.google.android.tzdata2)
Merge "app crash due to Invalid column count IllegalArgumentException" am: 30b3ba89e4 am: 1a3969c61e am: 9a077af94c

Change-Id: I0f744ad162ba27dd951d54df85ae4f5d8dd26273