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

Bug: 269346300
Change-Id: I948e2d29fc58a2937a203318b812ec0fa77baa9f