Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.3.9.08.00.00.385.300' into pi-dev
am: d5dc6de2f5

Change-Id: I25779c2040ab17b44d7bff65b7a7d92c2c38836a