Fix errors in metadata scecification

Change-Id: Ifccb0c5dbadbc4a0ecfa9d7a871c0353730ab522
Merge "Fix errors in metadata scecification"