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

Change-Id: Ifdf5e4235397aaa1e59c72445c37d3e627437432