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: I023ffb75f836de2c33eb7dbee52072e1622448bd
Change-Id: I429791636f667a19c383a2a0c524a2068cf2812f