Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.R1.10.00.00.597.042' into rvc-d1-dev am: b6da9f9741 am: 509e69c1af am: 9ec996c558

Change-Id: I5de235fc60c0dd600709934085f0a0e740693560