aml_tz3_311312010
Merge cherrypicks of [19657988] into sparse-8573764-L36300000955994297.

Change-Id: Icd920c18c51a67abd4d13be9dafe52ca90134a25