Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 4e0527be03 am: 38580c7bcb

Change-Id: I4c9aacaa013ad0e2666fa02bdaa3d9623491620a