Merge changes Ie0345988,I4ceb53e3

* changes:
  Add more stats to EdgeFinished proto message
  Fix syntax error in frontend/native.py