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

Bug: 269346300
Change-Id: I049390fcf7abcb3c907f776cdd0c8b011a517677