Rollback to stable code from tizen_2.1 branch