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

Bug: 269346300
Change-Id: Id387e066d9d1b9b883a66967a9d62e643b65a8b0