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

Bug: 269346300
Change-Id: Ieb1cd3293801730287a8dfc9da21aba0b6b1d132