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

Bug: 269346300
Change-Id: I0992d8473e418fd09f99fe10105eb23382d67fca