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

Change-Id: Icb99fddd660f21aa8b0b9d6c3e0d1bf5ce7f4fb0