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: 5f140b808e

Change-Id: If8b06b91f1ba3af84b5ce3c74fb929541f46b825