Merge "Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.3.9.08.00.00.385.401' into pi-dev" into pi-dev
am: 46dabeba8b

Change-Id: I612300c23c3b80f58e3228cf8f63e6249fcc1f0e