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

Change-Id: Ib579e09e9ea6e523a2957608ea47ed552516b78b