am cc25dfef: am 877f7413: am 7733e474: am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev automerge: 869d252 automerge: 1a174fc

* commit 'cc25dfeffb9ed6fa34d4c90a14c529be8443c4db':