Merge "Add StrictMode checks to BlockGuardOs"