Merge "Remove old meta data declarations in manifest" into pi-dev
am: 9b7f0e4c5d

Change-Id: I5c28d032d6ca39be4ec9a239ff0637d3806ae74f