Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.107' am: 03b52014b8
am: b2e85c0cd7

Change-Id: I990710ddfe2b2b0724549756aab1c4a5a26c8cde