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

Change-Id: I7ec1ca9e6ef85c6925ff882c42f1af6bee6832ce