Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.021' am: a509f54d9f am: 0c2a244910 am: 4e7a6cd6df

Change-Id: Idb19fd6935a85b42cf6a23805d5164d031cf993a