Fix device asserts

Conflicts:
	tools/releasetools/edify_generator.py