Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.035' into rvc-dev am: aecb2bf532 am: ee73c05f74 am: 465ad6d4c8 am: cbeff1e913

Change-Id: I78b0db682fdf5e9676990d3fd1a6bb43d7feb578