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

Change-Id: Ia6854f3b4e04739d81c356deb1ced8c356d211fd