Merge "Add METADATA." am: aef68593ba
am: 3bc677351c

Change-Id: I3d00288319570095add071cb400f306bf4f09614