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

Bug: 269346300
Change-Id: I8d51eb050e5f38e75633d16e49b36dc70f65f511