Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0 am: 43dad372e7 am: aa8c778d64 am: a0b2e1682f
am: 443a1aa7db

Change-Id: I96ec7f79d6d1bec36874962386507719529b3965