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

Bug: 269346300
Change-Id: Id2768a2c818d7bcbe85621b5f9b911e8df72aa7d