Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.R1.10.00.00.597.042' into rvc-d1-dev am: b6da9f9741

Change-Id: I81a7351aa62ab5057b3ba9a7e14e70332f51eec1