Pick up some fixes from Music2

Change-Id: I0e6712a2ecee0f6486cad6af9a614d86289466a5
2 files changed