STS: Improve robustness of containsDriver() am: 837a6ca9c3 am: 433b711019

Original change: undetermined

Change-Id: Idb81c130bd5d167e87a4d61a2f46a8f346976b44