Merge "Move key attribute information out of native."