Initially we duplicated the code to avoid large scale changes to the packages. Now we are past metainfo refactor we can remove the duplication. Change-Id: I9d0b2756cc6e2a2f4d576afa408a15273a7e1cef
Change-Id: Ie2527b673dd4ce5250cf5c0cbf8f14921262f665