Merge change 22089 into eclair

* changes:
  The MetaData API is optional and getMetadata may return null if unsupported.