Merge "Revert "Stop granting init access to block device properties""