Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0 am: 43dad372e7 am: aa8c778d64 am: a0b2e1682f am: 443a1aa7db am: 1b0f31aa40 am: 0465a2c215
am: 93c02f8427

Change-Id: I41cd3d797f6846fa16f18bdd4fcfa2903612309a