Merge "Add support for non-partitioned devices for system"
am: 9d6b55928c

Change-Id: I414e81a89dbc9505c9eeff0d1d2e2ad4fb5ad01d