Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.021' am: a509f54d9f am: 0c2a244910 am: 61cc951e3e am: 16ff8c192d

Change-Id: Iffe61ca5a48b090f1121406a1755aaebe76a467b