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

Bug: 269346300
Change-Id: I3dfd651845765bd9fb2d37b08ce0fdd516bb25c9