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

Bug: 269346300
Change-Id: I26134432454b0554dd378457de59e16bc5fe6b5f