Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.038' into rvc-dev am: 419e6187ae am: f2d9925d61 am: 5da5c288c5

Change-Id: Idcc8d126748a938f0073ff5d0a8bc9244bc8632d