Merge "Add metadata files" am: 7868877020 am: ffaafb30f7
am: 97aeebc482

Change-Id: I81cd6ac17b55d7a5ecc5cf122b35269c62eac107