Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.038' into rvc-dev am: c7b3d621ad am: fad1e7d9a1 am: 21b12406e7

Change-Id: I32809afc3c6ca1fc8609c8224efbdd02b04b9a38