q_tzdata_aml_295500002
Merge cherrypicks of [20388533] into sparse-9189353-L75700000957236973.

Change-Id: Ib1595d8f4b509c3506f114def83543093f359b3e