Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.08.00.00.478.137' into pi-dev Bug: 120390132 Change-Id: I87be8303401a71ce1607294a3a118833a0a3808c