Merge "Add metadata" am: bd454345fe
am: 980d7b00ee

Change-Id: I87681f4f641269a96e927fc76e506e5de93a5218