[coastguard skipped] Merge sparse cherrypicks from sparse-9881399-L74500000959673443 into qt-aml-tzdata-release.

COASTGUARD_SKIP: I041a5a786b0019efc5f7c35131f8f1bc05444595

Change-Id: I9710396b2560ffb40114be768d2a9688aac51f38