am 1fd55894: am 371b1b61: Backport from master - add crespo and stingray

* commit '1fd558942fba95e04c158392ebc6e2d597e433cb':
  Backport from master - add crespo and stingray