Merge "Rename runtime -> runtime_native property namespace"