Merge "Add metadata"
am: 5464982800

Change-Id: I79ae940ddcc7217fe768bf2cbeaf8a3142a0fede