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

Change-Id: I0b080e7169932bf08747f540d8d9ebaa6487f38a