Merge "Add metadata"
am: 4e547dc748

Change-Id: Ifaa29251c3437f41c368c8ef6242fe5e77c255a1