am 783e2656: Add robustness against vendor dependencies

* commit '783e26565ce5dbd0c56af1a2f3d54cdc41f13a40':
  Add robustness against vendor dependencies