Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.167' into qt-r1-dev am: 431e40b883
am: e822d3f827

Change-Id: I67ba3b583a367ff17bedb4f179de16c165c23bfd