Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.R1.09.00.00.529.057' into qt-r1-dev am: 709263c923
am: 45d8fbcf88

Change-Id: I7568e9428986b3424b98f61826714c385380b7aa