Merge "Add metadata" am: 4e547dc748 am: 4eb5ada96d
am: 705ba58994

Change-Id: I44d6099f2dcc642399b29b6a9eabbd1d9e85a357