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

Change-Id: Ic80ff4e303fe6dec6017bd0cb59ddf81f6e4ff16