Merge "Add metadata partition" into master-cuttlefish-testing
am: add80cbb6c

Change-Id: Idf5ac7d953c889978fead0f06ede0de7f69a9d4e