Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C1.08.00.00.516.007'

Bug: 121228685
Change-Id: I9bbc678bae405b52b6eeeda8133574f9e9fe8b71