Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.13.R1.08.00.00.571.037' into qt-qpr1-dev am: 80653c6934 am: dc457b60cb

Change-Id: I0bbd946f2cadb6d323e3d33fbf1db99e9584393f