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

Change-Id: I894a0238bc059bc08bab0bfd8f73e9d5ea6912b6