Conform to REP-127. Also add new pkg to metapackage's package.xml.