Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: e473ba3d58

Change-Id: I7a92b91e400b809c09de97188ea6fe1ba375f6c4