Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.406' into qt-qpr1-dev am: 8366779010

Change-Id: I8cc51226f595b48fbf0fcb779903f09541b43e07