Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.R1.10.00.00.597.032' into rvc-dev am: 5f1f6d2761 am: a93643c0df

Change-Id: I3989a69a564dcc866483c8e1e6423de0bb3a27b3