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

Bug: 269346300
Change-Id: I8b2cc3ae9c333478c7b99f03d817a03f4124df4f