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

Change-Id: I679c3842a4709d962c0f4e20d8d07ba0e6f47c88