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

Change-Id: I24408e23ee0951572df4238a2af88810b5c42266