Merge "Remove old meta data declarations in manifest" into pi-dev