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

Bug: 269346300
Change-Id: I7ffbc0b35ba17e46b0a18386a1593fe119d826c7