Merge "Add Blocked Device property." into gingerbread