Merge change 7932

* changes:
  Minor cleanup in Metadata.java