Merge "Add an exported flag in manifest"