Merge "Add metadata" am: 5464982800 am: f31b2f8d0c
am: 73bcf6f740

Change-Id: Ic74e3f6e032dfbfed8bac1eeec437166a6d665a3