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 am: 1d12419f63 am: 8094ae6164
am: 8d5bb6ee5a

Change-Id: Id6acc0d858c710e7db9d0217a309adf5b17d0c1e