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

Change-Id: I2fe47f67f180bf447ebff454a5af0a589b42c853