Merge "Add metadata" am: 5464982800
am: f31b2f8d0c

Change-Id: Ieef6cd23bf9a1b849bb9e3be522b7e469dc9b52a