Merge "Add metadata partition" into master-cuttlefish-testing