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

Change-Id: If7e9e3ee89cc068120ef77163e876ee61f3d91ca