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

Change-Id: I7154afaaf6443522b642b97d70b6330ef9df69f3