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

Bug: 269346300
Change-Id: Ic0897d04905653820fa29084fbb2003b186e8816