Merge changes Ie2c5e36e,Ib058fb62

* changes:
  Add license_type to METADATA.
  Add more metadata.