Follow-up to commit 44177e69 Test: vogar BlockGuardOsTest Change-Id: I7dacca4d1fe712f22bfd2f2e8722ca85e1f3f9f7