Add robustness against vendor dependencies

Bug: 6815609
Change-Id: Ic9346affdab556fffceee03e4748a46c930fab73
1 file changed