Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread