Merge "Make VBRISeeker more robust" into security-aosp-nyc-mr1-release