Support NDY metadata

Change-Id: Ifebed2de671ac516782a4daf49b2440e89ec4533
20 files changed