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 am: 0193f4aec3

Change-Id: Iec2037ac7d1e78bc6ea2827d65c5d55be9a8fd88