Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.1.R1.09.00.00.461.057' into pi-dev

Bug: 117197316
Change-Id: I7188201d5f195b10aa81fc913467776aff3c09d5