Merge "Update system metadata for manila"