Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.021' am: bf6a61c40a am: feaa14f200

Change-Id: Ife560154dd0260de02dd1893397722ab7658cd68