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

Change-Id: Iea708a2b83eb0535a24dcde2a295f4dc00a03cb6