DO NOT MERGE - Merge tm-qpr2-release into tm-platform-merge

Bug: 269346300
Change-Id: Ibf6582a18f0ae359b32695748cbbc36baa4ca303