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

Bug: 269346300
Change-Id: Id19ef31719c00cb99673a8ac421dec3299e047c6