Merge "Follow-up BlockGuard polish."
am: 3c939eed22

Change-Id: Ic80203a7eaf45efa0347b3a81e90ac6a7e9fdb03