Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.1.R1.09.00.00.461.057' into pi-dev
am: 1d774a8332

Change-Id: Ia6ff4c37e3837dbc9813d3de2d36cbb9d0194f50