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

Change-Id: I08c7b59c2d6bcbd96accbbe8a0024d0327596320