Modified /frameworks/native part