Merge "Add METADATA."
am: aef68593ba

Change-Id: I3bd896ff0b5ac66b5dff05b530d3e2068e5aa2a6