Merge "Add metadata" am: 4e547dc748
am: 4eb5ada96d

Change-Id: Ic8cce3ec5f3e0e6eea6fc20c5ef9d7c66c5bb834