Merge cherrypicks of [19656115, 19658839] into qt-aml-tzdata-release.

Change-Id: Ibbb47c331d9cef70478fa81a183d4d5dcfd24c5d