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

Change-Id: I89eecc47f9281b3f8e6d87f001bb77a7c2edeaed