Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.R1.11.00.00.597.108' into HEAD

Bug: 182748782
Change-Id: I28c7ad8a699fc2ddddc5de5f8901437fd4a981d3