Merge "Add support for non-partitioned devices for system"