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

Change-Id: If59a1a4a9c779b41916cbea378d885e1295ac15c