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: aeac1c1104

Change-Id: I7286d52b7f39acfb858c1ed2c828c26defd66946