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

Change-Id: I0a65c1208bae758f90af891ecd58d630aaaa1708