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

Bug: 110126338
Change-Id: Icb2be3e7de033c894ec427db684a577e50b5d6af