Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.3.9.08.00.00.385.376' into pi-dev
am: 3d55bd42a1

Change-Id: Ic79bcbcb46bf1e3224da49f7c9bdeafab109e5e9