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

Change-Id: Ia7a38aa375fd269177da02f557337bf18ee7cf25