reverter native and development

Change-Id: I7ce5a6e88f99f518f375c8899b14369490582789