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

Bug: 269346300
Change-Id: Ide2f9136cd2d3fb0f118823ccffcb62f78f66601