Merge remote-tracking branch 'goog/master' into btAdapterFix

Change-Id: I5cc4d5fca1d3a1bd46b07100b10269029fb4fe68