am 6ef6615d: am 8160c6b6: am d3956f95: Merge "Stop rejecting valid flings in quick contacts" into lmp-mr1-dev

* commit '6ef6615d0c085f48ca553419b1969c53ec2928ac':
  Stop rejecting valid flings in quick contacts